Resolve CVS conflicts

diff --git a/lisp/progmodes/ebnf-abn.el b/lisp/progmodes/ebnf-abn.el
index 35cbf2c92880e85cc012d4e2576cd21215d159a6..ec96109e0a0f8d5cb38f5da1aa136372e22c0fbf 100644 (file)
--- a/lisp/progmodes/ebnf-abn.el
+++ b/lisp/progmodes/ebnf-abn.el
@@ -659,6 +659,5 @@ See documentation for variable `ebnf-abn-lex'."
 
 (provide 'ebnf-abn)
 
-
-;;; arch-tag: 
+;;; arch-tag: 8d1b3c4d-4226-4393-b9ae-b7ccf07cf779
 ;;; ebnf-abn.el ends here